From c92a94b6e1051b3395d64931fbc6b49ae434f04d Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 24 Jan 2007 18:23:23 +0000 Subject: [PATCH] bimodal xenfb daemon: Fixes and cleanups. From: Gerd Hoffmann Signed-off-by: Keir Fraser --- tools/xenfb/xenfb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/xenfb/xenfb.c b/tools/xenfb/xenfb.c index 9694e1b9f7..a692f8fd86 100644 --- a/tools/xenfb/xenfb.c +++ b/tools/xenfb/xenfb.c @@ -362,12 +362,12 @@ static int xenfb_map_fb(struct xenfb_private *xenfb, int domid) */ uint32_t *ptr32 = NULL; uint32_t *ptr64 = NULL; -#if defined(__i386_) - ptr32 = page->pd; +#if defined(__i386__) + ptr32 = (void*)page->pd; ptr64 = ((void*)page->pd) + 4; #elif defined(__x86_64__) ptr32 = ((void*)page->pd) - 4; - ptr64 = page->pd; + ptr64 = (void*)page->pd; #endif if (ptr32) { if (0 == ptr32[1]) { @@ -383,7 +383,7 @@ static int xenfb_map_fb(struct xenfb_private *xenfb, int domid) /* 64bit dom0, 32bit domU */ mode = 32; pd = ((void*)page->pd) - 4; -#elif defined(__i386_) +#elif defined(__i386__) } else if (0 == strcmp(xenfb->protocol, XEN_IO_PROTO_ABI_X86_64)) { /* 32bit dom0, 64bit domU */ mode = 64; @@ -441,9 +441,6 @@ static int xenfb_bind(struct xenfb_device *dev) if (xenfb_xs_scanf1(xenfb->xsh, dev->otherend, "event-channel", "%u", &evtchn) < 0) return -1; - if (xenfb_xs_scanf1(xenfb->xsh, dev->otherend, "protocol", "%63s", - xenfb->protocol) < 0) - xenfb->protocol[0] = '\0'; dev->port = xc_evtchn_bind_interdomain(xenfb->evt_xch, dev->otherend_id, evtchn); @@ -567,6 +564,9 @@ int xenfb_attach_dom(struct xenfb *xenfb_pub, int domid) errno = ENOTSUP; goto error; } + if (xenfb_xs_scanf1(xsh, xenfb->fb.otherend, "protocol", "%63s", + xenfb->protocol) < 0) + xenfb->protocol[0] = '\0'; xenfb_xs_printf(xsh, xenfb->fb.nodename, "request-update", "1"); /* TODO check for permitted ranges */ -- 2.30.2